Added indexing for content size and media type

Closes #1037