Issue 20333: Fixed problem with CustomerType on advanced search