fixed subpage issues