[Bug 884778] Advanced search doesn't validate. Merged the different widgets with a cannonical one