Use Algorithm and Keygrip columns in keylist
(cherry picked from commit d280666f29181035557119fe4d0ae91e4d5776d4)