Initial code
Updated filtering for feature collections