* fixed custom query stuff
* added order by support for normal queries