Improved URL catcher regex (A LOT) and reverted last commit partly