fix minor bug with list click handlers
Merge branch 'release/0.31'