A LOT of bugfixes in both searches.