ROOMS-430: Checkout Availability Filter issues