COMMONS-190: unified search - improve QueryParser & bug fixes