Core - Fixed some edge case trimming issues with ta2kv()