Fixes review comments for scope in thing-picker in modal