store current query and scope for module
escape query string to be displayed in HTML
Merge pull request #2552 from adobe/randy/issue-2503

Fix Find in Files bugs