Fixed issue with optional 'AND' element. Also fix issue with Columbia example on Safari