fixed issue with account based filtering