Better on_command detection - messages in queries are now commands.