And this is not related to title tag, so these changes should be separate commit ;)