Add Search support, forgot to add some files before.