ROOMS-223: Create helper funtion for operation options and fixes

ROOMS-223: Create helper funtion for operation options and fixes