Add ability to search URI or prefix