search update
front-end search implementation
merge