added support for URL in current context
added support for URL in current context