adding rest functions
fixing content search tests
small fixes
blocking
merge conflicts
merge conflicts
Merge pull request #932 from AdamSaleh/AdamSaleh-content-search-fixes

I need to move on to next issues depending on this. Fingers crossed I don't mess anything up.