Customer search table cleanup

Cleaned up customer search sql, added sql to search addresses.