Feature/query string options