Anchor and query string parsing added