Fixing Query.