Changed queries. Bugfixes.
Changed queries. Bugfixes.