Fixes to make legacy module work correctly for next and tailable cursor