Fix option selecting and added contour basis