misc fixes, improve search