Fix dynamic loading of homes