added filters to stats
conflicts resolved