Added better tables to search