Fixes for surf mode pagination conversion