Update code base to better handle location code

added For: Data For: PIs PriorityHigh StatusCompleted Type: Bug Type: Enhancement labels

assigned to @maeva

requested review from @ohosseini

approved this merge request

Looks good to me.

mentioned in commit 8ef953c3

merged