COMMONS-190: unified search - keep search types' order