*8479* Fix trimming of empty entries