Groups routing + fixes