Fixes in parsing (in 'To' field)