fixed the current_page selection
current page fix