minor fix and softdeleteableentity