ROOMS-497: Improve exposed filter support