update empty criteria and change how to exclude fields