Reverted to even stronger unique URLs