fixed query
preliminary arma stuff