updated for search
merged
updated js and server