fixed view logic for nil and empty string
merge
Merge branch 'front15'
merge