Update Query to prevent data mix

`SELECT sometable.* FROM sometable` is now the base `Entity.query(...)`