CMS-4702 Fix indexing of media meta-data

fixed so it doesnt flood index with metadata, and prepare for media-type based index-config.