d6ab2e5f9b
- This commit fixes two issues.
- Firstly complete with correct option as existing bug was
to wrongly always complete with first option which used
wrong provider.
- Secondly filter out duplicate option proposals giving better
result when options is already in place.
- Backport #495
- Fixes #498
(cherry picked from commit a143d25ffc)