The previous fix made impossible to select multiple criteria, this commit fixes it
refs #689
Merge remote-tracking branch 'origin/next' into next