Hotfix for issue #1, conflicts with custom&baseval generated urls overlapping