Fix select-self leaving out important options
#914
Merged
select-self leaving out important options
#914