diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 1b1bd07e3..1a30a2685 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -778,6 +778,7 @@ class DboSource extends DataSource {
 						}
 					}
 					$this->__mergeAssociation($resultSet[$i], $fetch, $association, $type);
+					$resultSet[$i][$association] = $linkModel->afterfind($resultSet[$i][$association]);
 
 				} else {
 					$tempArray[0][$association] = false;
diff --git a/cake/libs/router.php b/cake/libs/router.php
index bf74fd21f..d899d40b3 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -737,15 +737,15 @@ class Router extends Object {
 	}
 	function stripEscape($param) {
 		if(is_string($param) || empty($param)) {
-			$return = preg_replace('/^ ?-!/', '', $param);
+			$return = preg_replace('/^ *-!/', '', $param);
 			return $return;
 		}
 		foreach($param as $key => $value) {
 			if(is_string($value)) {
-				$return[$key] = preg_replace('/^ ?-!/', '', $value);
+				$return[$key] = preg_replace('/^ *-!/', '', $value);
 			} else {
 				foreach ($value as $array => $string) {
-					$return[$key][$array] = preg_replace('/^ ?-!/', '', $string);
+					$return[$key][$array] = preg_replace('/^ *-!/', '', $string);
 				}
 			}
 		}