More address style tweaks. Fixed a bug in the select... hopefully didn't introduce another.