Clean up ScreenUrl normalization and matching