add new cs tests
content search fixes and blockers
Merge pull request #849 from AdamSaleh/search-counts

Search counts