[AGP-10] Fixed: routing error which showed pages returning things they shouldn't do