First part of adding flags returns from name_query ...