Update comment
Add warning message when there is no entry in current view