Fixed issues related to Shape Selector
Fixed issues related to Shape Selector