Add search button to Concept search  -TRUNK-3836

TRUNK-3836: Improvements on first fix

TRUNK-3836: Further improvement on fix

TRUNK-3836: Avoid double search