Now searches both tables