The Events Calendar: Custom Titles w/WP SEO

custom-wp-seo-titles.php

<?php

add_filter('wpseo_title','my_custom_titles');
function my_custom_titles($title) {
	if( tribe_is_month() && !is_tax() ) { // The Main Calendar Page
		return 'Events Calendar';
	} elseif( tribe_is_month() && is_tax() ) { // Calendar Category Pages
		return 'Events Calendar' . ' &raquo; ' . single_term_title('', false);
	} elseif( tribe_is_event() && !tribe_is_day() && !is_single() ) { // The Main Events List
		return 'Events List';
	} elseif( tribe_is_event() && is_single() ) { // Single Events
		return get_the_title();
	} elseif( tribe_is_day() ) { // Single Event Days
		return 'Events on: ' . date('F j, Y', strtotime($wp_query->query_vars['eventDate']));
	} elseif( tribe_is_venue() ) { // Single Venues
		return $title;
	} else {
		return $title;
	}
}

?>

I'm getting the following PHP notice with this:

Notice: Undefined variable: wp_query in file.php on line 239 Notice: Trying to get property of non-object in file.php on line 239

I have added "global $wp_query;" and it seem to have fixed it. I'm not sure if it is correct.

When displaying the title for events list if you start browsing the list clicking on "Next Events »" or "« Previous Events" the title disappears.