Fix IPNetwork database stuff; use group name as key; stuff