better completion selection mapping