Improving entries listing