Switch means of determining int/str queries, update C3js adapter