Subject selector

Changed from getOptionByText() to getOptionByValue()