add catch exception in case of non exist data no required
clean and rename field
rename field according to new fix on models
rename field into views
commit updated tests