Closes #160 - Cannot save search settings due to invalid merge.