added optgroups for AQL editor