added parsing query string