Added frontend filtering, refcatored data sources