simplify things a bit. move option lookup out of create select