Adding soft delete
search by PN; nested form; spec cleanup