Improve pagination
Fix empty results