Added missing files, and fixed a bug in the search type handling