Allow empty URLs.
Add /logical and /physical to Query