Added Archive filter support