Bugfixes, searching improvements.