Merge Fields Fixes