Revert "Revert "enough catching all urls""

This reverts commit 9c5c0adbae4af0442cdb73a801dc6b79c77c5a2d.