core-4694 add basic query string handling