But ultimately I think the filter should be just based on the presence stanza ID, since it appears to be stable.
I think we had this issue once already.
XEP-0045 says:
For tracking purposes, the room might also reflect the original 'id' value if provided in the presence stanza sent by the user.
This doesn't feel stable enough for me.
And yes, check for 110 is probably not needed.