Fixes and improvements to searching&indexing.