Fix 'between' filters