fix #83 Adding further filter