CMS-2481 Index-configuration of content

Some cleanup and improvements