Tighter LocationMatch for export formats