updates for custom filter... some from sq