Maybe you should try with Zone filtering (prior you have create and assign data source to this Zone).
You can tag assets in the Asset Manager and then use these tags in the Source and Destination IP filters (and maybe others).
michal.kwiatkowski, I never thought about this solution. I will explore it and give you feedback.
acommons, I have already many data sources created (which are not in the Asset Manager). I tried but i couldn't include those already created in the asset manager (i.e. i can only create a new asset but i can't link it to the data sources already created). If i try to generate a new Data Source, i get (as expected) conflict of IP addresses. Any suggestion?