Feature home event bug fixes