query display improvements for regular and data queries