STORE-139 Fix

Injection of default values if a field is empty