Replace use of addAttributeFilter and addFieldFilter by addFilter
Fix filter specs