diff --git a/includes/templating.php b/includes/templating.php
index 55939ac..394400f 100644
--- a/includes/templating.php
+++ b/includes/templating.php
@@ -35,7 +35,7 @@ function i18n_init() {
 		$this->future_signifier = __( ' (Anticipated)', 'wp-resume' );
 
 		if ( defined('QTRANS_INIT') || $this->parent->api->apply_filters( 'translate_date', false ) )
-			add_filter( 'resume_date', array( &$this, 'translate_date' ), 10, 4 );
+			add_filter( 'resume_date', array( &$this, 'translate_date' ), 10, 2 );
 
 	}
 
@@ -198,7 +198,7 @@ function get_date( $ID ) {
 				continue;
 				
 			$date .= '<span class="' . $class . '" title="' . date( 'Y-m-d', strtotime( $value ) ) . '">';
-			$date .= $this->parent->api->apply_filters( 'date', $value, $field );
+			$date .= apply_filters( 'resume_date', $value, $field );
 			$date .= '</span>';		
 			
 			//this is the from field and there is a to field, append the dash
@@ -239,7 +239,7 @@ function translate_date( $date, $type ) {
 			return $date;
 
 		//i18n date
-		$date = date_i18n( $date_format, strtotime( $from ) );
+		$date = date_i18n( $date_format, strtotime( $date ) );
 
 		//we don't do anything else to start dates, so kick
 		if ( $type == 'from' )
@@ -251,11 +251,12 @@ function translate_date( $date, $type ) {
 
 		//append e.g, ' (Anticipated)' to future dates
 		//note: this string won't appear in .POT files, but should still hit qTranslate when run (I hope)
-		$date .= __( $this->parent->api->filters( 'future_signifier', $this->future_signifier ) );
+		// TODO: Fix this since right now it does return a Fatal Error
+		//$date .= __( $this->parent->api->filters( 'future_signifier', $this->future_signifier ) );
 
 		return $date;
 
 	}
 
 
-}
\ No newline at end of file
+}