Search implementation refinement

This is some preparatory work for moving search query parsing out of the engine and in to the client, simplifying search folder and search UI implementation and making it a bit more robust.