readded old feature (fix endpoints toggle)