Fix bugs after refactoring home()

Hotfix