@dannyroberts I created a new pull request. https://github.com/dimagi/commcare-hq/pull/1379 , we changed our solution, please take a look.