reorganising & more adv query opts