Fixed persistency of Matching preferences #5337