Can we move the query/list of entities, to the else part? just when when `surveyInstance.getLocaleGeoLocation() == null` ? We avoid querying that data if we have Geo data in the surveyInstance