fix possible bugs with entries display