Updated todo
Renamed 'select' to 'query' in template, since it makes more sense if you are going to do similar with commands.