Fixed CW-694: Error on filter by content type. Also removed hard-codings from code