added ? and = to work with query URLS