table fix and home event fix