Issue #24 - Updated helper to handle root page.