Fixes query string getting lost until the user clicked into the query string field when after filters.
Changes the global search filters to auto-reset on query string focus if there are no results.
Merge branch 'release/2.0'

Conflicts:
	db/src/main/java/com/psddev/cms/tool/ToolPageContext.java
	tool-ui/src/main/webapp/script/cms.js