activitymanager: concatenate queries with 'or'

As discussed with @nickvergessen , concatenate queries with 'or'. If various extensions are implemented we want to match any query.

cc @DeepDiver1975 

$conditions needs to be prepended with an `and`