Added some fixes, removed pagination