EZP-20438 - Refactored content/location/view providers in order to extract the matcher part