Changed the query UI to accept addresses