Fixed some issues in the entries list