SOL-20 Bug fix - current_page