Fix sort_by next page
Merge branch 'aji' of https://github.com/thomasmu/pegimakan into aji
Fix image edit
Merge branch 'aji' of https://github.com/thomasmu/pegimakan into aji