fix bugs with current page