COMMONS-190: unified search - general bug fixes & improvement