better title handling