a few tweaks in the search