Improve the new approach

Works better but there seems to be a difference when selecting an entry by
mapping and by hitting <cr>.