I had thought that "gay" was the generic inclusive term for all homosexuals regardless of gender (and there are more than two) but then we got LGBT plus sometimes several more letters breaking us down and separating us into different groups.
I can see now that "queer" is the generic term.