Fixes, simplified syntax for multiple comparisons on a single field