adding rest functions
fixing content search tests
small fixes
blocking
merge conflicts
merge conflicts