fix expression issue
figures where clause fix