Fix html entity decoding and client selection in urlTracker