Improved subscription matching