search works
merged upstream