Added team filtering