Fixed bug and implemented tracking changes in htmlbase