Added support for URLs with both query and anchor