Browsing by Keywords improvements