Fixed pagination plugin and other little plugin improvements