@dildick - with this change you'd loose selection of GE21, I think.