Added select dependent both and minor fixes