Support mixing of entity and scalar projections #620