All searching now works, along with modals