Refactor tracker data building in Panel Data to accomodate update use…
db70769
… case without duplication
