Add fields for content search and refactor content filtering
Rewrite content search
Update content search test cases
Merge pull request #1100 from concerto/contentSearch

Add fields for content search and refactor content filtering