team and buddy filter done + syntax corrected v2