Fix rules

Fix rules
Fix pagination

Fix pagination