Improve search for description & finish comments