Issue #3349761 by Ranjit1032002, Anchal_gupta, Nitin shrivastava, Rishabh Vishwakarma, joachim: pointless if() block in EntityViewsData