added some more logic for filtering spark feed
Merge branch 'spark_feed'