add for home search and fix persistence