Added option to display only public entries