Updated search activity a little bit
Merge commit '80f09f1905ab202832937e20c75082055c5596c3'; commit 'a154b69e2c3eda4789e40b39be7655ac2d6429dc'