pagination fix
rpc and some fixes