CDB-877 #Fixes loading of params in the URL