improve output of current-queries