Merge pull request #1636 from nutan-gooru/dev-branch

Implemented pagination after reorder
fixed null issue