Use new mapping function in doctus swing selection