Rework query dialog to have only one status label