Fix a #nil error when doing  where entry has a single page
Minor formatting issues