BUG-1503: fixes broken matching for 'hidden' values.