Previous commit bugfix
Merge branch 'service_queries'