closes #282, improves and hardens pagination