QAART-198 fixes for delete/undelete QAART-199 fixes for categories