Added groups (/w domain filtering, where)
Improved route grouping