bypass facet search bug, put exclusion of highlighted item from search back in place, remove some sonar issues