IPASS-3: Cleaned up the mechanism for grouping configuration and, added some filtering of the yml config