Fixed scripts notation and added select control