NXP-10980: fix deletion of empty values