Re #1296 Using the new limiting approach in all the controllers.