Merge pull request #6773 from nupplaphil/issue/6772-update_query_missmatch