Made Bene's changes and added run on change = true for _data view