Finish model and url changes for multiple queries, close #31.