Merge "Initial search bar implementation." into oc-dev