fabian/prod: links for keyvalues