Override save method for race prevention purpose
Fixed issue with filtering in the delete function