ENYO-3504: fix space/tab issues