Search integration. General tweaks. Errors re-formatted