FIX :: Shield " AND ", " OR " conditions with brackets for "where" case