Revert "Remove randomness"

This reverts commit 0ef75b7fe1360ae459004067f54e1869df8112d6.
Revert "fix search for base-url since it is usually a self-closing tag"

This reverts commit f7ceffc7568007b16aa9b2b1e11dab8f17329946.