Fixing pagination issue
More refactoring
Added missing locales