Minor fixes
Fixed pagination bug