Add filter support, fix indentation.