Minor label fixes. Added more search diagnostic messages.