Strict comparison to string for 'none'
No need to assign key variable before using as array key
Merge branch 'refresh'