pagination and fixes in resoures