Changed the Search function from C-Product to JOIN