Updating query builders to handle GIS data types