Fixed Query to find User by externalId