fixing some bad behavior on cleanup selector checkbox click + add table special handling in the UI