Add further search functionality.

Signed-off-by: Casey Piper <casey.piper@gmail.com>