Sample query fixed