Feature/64 activity search

2nd attempt and hopefully acceptable pull request