Added input in role form to allow matching against custom names. Changed default mapping to use role display name instead of the hidden DB name.