if keys supplied only return matching keys
Merge pull request #790 from dimagi/ret_keys

if keys supplied to indicator set only return matching keys