Better handling of serialised settings Closes #4584