Fix tracking code and feature rows