Add query helper method; add AddressFormatter.