Add query command and tweak wave reporting