Fixing issue where entries list was being rewritten