Implementing simple search, refs #23