changed behaviour for expression widget
Merge remote-tracking branch 'origin/master'