Views-based staff directory with multiple room assignments

I hope this isn't too elementary but I can't solve this issue. I've got a staff classroom directory built from views+cck --see https://www.haringcenter.washington.edu/directory -- and have a block view on the classroom pages that builds a mini-directory for each particular classroom based on who is assigned to that room.

My problem: I need to pull in all users assigned to that room, including those who may have different primary rooms (users can multiple rooms). Using two arguments--primary & secondary room--doesn't work, since the SQL query is looking for users who fulfill both conditions (i.e., have a primary and secondary room identical to the current page).

I can either list users whose primary room matches the room in the URL, or whose secondary room matches, but not both. Is it possible to get both sets of results?

Here's the problem part of the SQL query:

WHERE ((profile_values_profile_lastname.value) != ('')) AND (profile_values_profile_room2.value = '127') AND (profile_values_profile_primary_room.value = '127')
   ORDER BY profile_values_profile_lastname_value ASC

I need some way to make the second 'AND' an 'OR'. Hoping this is possible through the Views UI.