separate player and opponent filter for ai, organization improvements