Add support for evaluating url parameters and fix some issues