Fix #235 improve clear_select_mode_mappings behavior
Fix #237 expand trigger problem