Added OR operator to queries, finished numfmt stuff