diff -r f12594938a03 -r 0a297eb46ba1 src/RequestedField.h
--- a/src/RequestedField.h	Thu Jan 17 23:26:48 2019 +0100
+++ b/src/RequestedField.h	Fri Jan 18 16:47:56 2019 +0100
@@ -34,9 +34,13 @@
 	string_t group;
 	string_t name;
 	std::vector<string_t> aliases;
-	std::map<string_t, string_t> options;
+	/**
+	 * used as an ordered multi-map
+	 * option name, value, name, value,…
+	 */
+	std::vector<string_t> options;
 
-	RequestedField(const string_t& group, const string_t& name, const std::vector<string_t>& aliases = {}, const std::map<string_t, string_t>& options = {}) : group(group), name(name), aliases(aliases), options(options) {
+	RequestedField(const string_t& group, const string_t& name, const std::vector<string_t>& aliases = {}, const std::vector<string_t>& options = {}) : group(group), name(name), aliases(aliases), options(options) {
 	}
 
 	/**