Fix improved keys feature