Fixed issue with matching URL escaped / as well as unescaped /.
Added support for customised "CLIVE" maps, and improved general storing of values.