First attempt at fixing HTML/link parsing issues