COMMONS-190: unified search - code cleanup & comment (quick search)