fixed query command option parsing