Issue #14: not trimming ids and names anymore