Worked on #22
Added pagination disabling prevention