sort of fixed #83, but deleted record still shows up in list view, see FIXME notes