[#22]Always show location fields when set