fpc,
Yes you almost surely did it correctly. But do check if your state allows even that 2% to be excluded from state taxation. One big exception is California where at least 50% of the tax exempt interest has to arise from CA bonds. In that case, you can just put it all as More Than One State. (A quick test shows that this CA determination is not automatically made by TurboTax for CA. Sigh.)
