cleaned up multi-query, and multi-query uses parameters
merged with github