Replace display_tracking hack by a service.
Fix bugs.