Changed entity query again