bug fixes and refactoring in the entries tracker