Changed Cascading input controls behaviour. (JM-283)
Added small fixes