More work on script selector.