improve address query