Fixed small delete bugs with empty fields etc