#42 Ensuring word-query settings are merged