implement todo
Merge pull request #1641 from dimagi/commtrack-loc-fix

implement commtrack todo