add filter resolver, fix some tests