Edit search active/inactive states

Edit search functionality, with active and inactive states, making is easier for the customer to review the current search and make changes if required. This is collapsed on page load so to take up less screen real estate.