Rework query display string