few fixes
Working with pagination