Expanded title checking logic a little