fixed query string build