Expand search functionality and fix uri.request_uri bug