bug fixes to comments, dnd and search

author: nhhughes
fixed dumb merge conflict

author: nhhughes