Add filtering  by team