Various selector fixes

Created by  Ed Langley  on February 20, 2019
S6OKB27NJL6WCVSOSCD7RLEXC4BR34TMALGC7FYDPBV2RT7UYXZAC
Change contents