CS fixes and conditional check in the views to show the search filter based on the presence of the Search plugin