Removed href resolution etc