S58065: query tweak to get rid of $or