Underscored Keys logic fix