Search and Restore activities more or less done

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>