fix interpolate location into query