Identified/resolved some additional issues with haiku search feature and commented code
Resolved some issues in haiku search and commented code.