BAC-116: fix for tracking on edit pages