Fix pagination handling for Structure urls/templates