COMMONS-190: unified search - reorganize portlet code