Browsing by Keywords performance improvement