BL-662, 696 and more format dialog work

I thought we changed this a while ago...sure you're not pulling in some old tmx?