Manual merge of my updates

1) Rest setup of content search
2) Fixes of content search

Hopefully, this enables ~47 more passing tests.