Cosmetics
Settings filter: Account for non-string keys. Closes #1663