[Fix] routes are now grouped