Added collating to schema generator, added quick search filter