Better web-handlers detection