Fixed Marr multiple where clause issue