Minor fixes + archive filter