Fixed duplication issue in views