Tweak to WebParser