Support up to 15 params in a Query, not really proud of this change :(