Feature/zen 14620

Make the query status string friendlier