Added query-specific hints.