Added extraction of tokens after changed parse_query