Fix database search problem.
Fix search bug in EDS bento pane.
Merge branch 'bento' into development