fix dicts
add global switch list