Make things consistent between rest and DB. CAF-276