Add "without_deleted" scope along with a couple of aliases