Now address query also works