Update query system
Add getCalledClass for old php version
Change query to collection
Remove last query