Minor Query Bugfix