Change to pagination url handling