[FIX] first try of fixing user pagination