Enhance search feature. Fix #196