fixed AQ structs to work with compare_model_currets