Add FCS feature + Fix bug in filter function