Update for issue 41: Remove pagination on single page

Updated with additional check for "total_page"