Add 'query' option to allow query strings to be included in fragments