Added correct tap handler to Util and updated hijackLinks to use it (+ fix)