more fixes for unicode search and cleanup