Changed title tag handling, to comply with guidelines