refactored a bit
Merge remote-tracking branch 'origin/master'
fixed error where non-deleted fields of view woudn't work