Improved handling of nested URLs in query expressions.