modified where clause by PUNX