Fix uri matching and remove old budget preference storage