Cleaned up searchEngine behaviour