- Fix issue with merge field picker not working after selecting first merge field. (Fixes #485)