Improve the "avoid URL normalization" mechanism [RTFACT-19342]