Update to fix ZIP_RANGE_QUERY and querying