Searchable catalog finally implemented and lots of bugfixes