Added support for variable values from url