page gen issue fix and enhance