Fix ambiguous field on query