Removed some leftover merge comments
Fixed search button