switched to parsing query params via tokenizer