Add search bar
Merge
message to explain why this merge is necessary,