Justin: Search Functionality (fixes OR searches for filtering)