Issue 2888 simple content search

Needs to be merged into both branches