*8430* Additional title tag fixes