search funtion re-fixed
Merge composer/master