Feature home event big fixes