Previously, only a contiguous block of uids would be presented to the user when trying to disambiguate a key. This happened because a key may have other fields interspersed among the uids, like UAT. Signed-off-by: James McCoy <vega.james@gmail.com>