Split up query, entity