fixed null cursor issue with PR storage