Add back pagination
Remove unneeded param conversion and debugger