URI handlers adjustments