Adding tracker numbers to TODOs, changing references to SearchModel
class members from instance to static.