Add support for unflatted in querystring