Task service and other query corrections