Don't trim value if not a string
Add fix to catalog and service
Merge pull request #440 from cookiekiller/item_ui_fix_trim

Doesn't trim value if it's not a string