Issue 2957 adding content when search is all

This might need to be merged by hand