v0.31 Search

Updated the search class
Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>