diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java
index b054bcc9876..f933e29c530 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java
@@ -34,7 +34,7 @@ import mage.Constants.Rarity;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
-import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -49,7 +49,7 @@ public class MightOfTheMasses extends CardImpl<MightOfTheMasses> {
 
         this.color.setGreen(true);
 
-        PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(new FilterCreaturePermanent(), true);
+        PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Duration.EndOfTurn));
     }
diff --git a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java
index fe2e1992c58..45adc936373 100644
--- a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java
+++ b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java
@@ -31,6 +31,7 @@ import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
+import mage.Constants.TargetController;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
@@ -43,10 +44,12 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class PrimalBellow extends CardImpl<PrimalBellow> {
 
-    private static final FilterLandPermanent filter = new FilterLandPermanent("Forest");
+    private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control");
 
     static {
         filter.getName().add("Forest");
+        filter.setTargetController(TargetController.YOU);
+        
     }
 
     public PrimalBellow(UUID ownerId) {
@@ -54,7 +57,7 @@ public class PrimalBellow extends CardImpl<PrimalBellow> {
         this.expansionSetCode = "ZEN";
 
         this.color.setGreen(true);
-        PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter, true);
+        PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter);
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Duration.EndOfTurn));
     }
diff --git a/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java b/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java
index a9a6bf7bd4f..00dbc45ed2d 100644
--- a/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java
+++ b/Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java
@@ -31,6 +31,7 @@ import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
+import mage.Constants.TargetController;
 import mage.MageInt;
 import mage.abilities.common.AttacksTriggeredAbility;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
@@ -44,10 +45,12 @@ import mage.filter.common.FilterLandPermanent;
  */
 public class TimbermawLarva extends CardImpl<TimbermawLarva> {
 
-    private static final FilterLandPermanent filter = new FilterLandPermanent("Forest");
+    private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control");
 
     static {
         filter.getName().add("Forest");
+        filter.setTargetController(TargetController.YOU);
+        
     }
 
     public TimbermawLarva(UUID ownerId) {
@@ -59,7 +62,7 @@ public class TimbermawLarva extends CardImpl<TimbermawLarva> {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter, true);
+        PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter);
         this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(value, value, Duration.EndOfTurn), false));
     }
 
diff --git a/Mage/src/mage/abilities/costs/common/TapTargetCost.java b/Mage/src/mage/abilities/costs/common/TapTargetCost.java
index ac78a037308..a580cd17735 100644
--- a/Mage/src/mage/abilities/costs/common/TapTargetCost.java
+++ b/Mage/src/mage/abilities/costs/common/TapTargetCost.java
@@ -46,7 +46,7 @@ public class TapTargetCost extends CostImpl<TapTargetCost> {
 
 	public TapTargetCost(TargetControlledPermanent target) {
 		this.target = target;
-		this.text = "tap " + target.getMaxNumberOfTargets() + " " + target.getTargetName() + " you control";
+		this.text = "tap " + target.getMaxNumberOfTargets() + " " + target.getTargetName();
 	}
 
 	public TapTargetCost(final TapTargetCost cost) {
diff --git a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java
index d870b3473ea..39e20e06b1e 100644
--- a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java
+++ b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java
@@ -10,39 +10,31 @@ import mage.game.Game;
  * @author North
  */
 public class PermanentsOnBattlefieldCount implements DynamicValue {
-    
+
     private FilterPermanent filter;
-    private boolean controlled;
-    
+
     public PermanentsOnBattlefieldCount() {
         filter = new FilterPermanent();
-        controlled = false;
     }
-    
-    public PermanentsOnBattlefieldCount(FilterPermanent filter, boolean controlled) {
+
+    public PermanentsOnBattlefieldCount(FilterPermanent filter) {
         this.filter = filter;
-        this.controlled = controlled;
     }
-    
+
     public PermanentsOnBattlefieldCount(final PermanentsOnBattlefieldCount dynamicValue) {
         this.filter = dynamicValue.filter;
-        this.controlled = dynamicValue.controlled;
     }
-    
+
     @Override
     public int calculate(Game game, Ability sourceAbility) {
-        if (controlled) {
-            return game.getBattlefield().countAll(filter, sourceAbility.getControllerId());
-        } else {
-            return game.getBattlefield().countAll(filter);
-        }
+        return game.getBattlefield().countAll(filter);
     }
-    
+
     @Override
     public DynamicValue clone() {
         return new PermanentsOnBattlefieldCount(this);
     }
-    
+
     @Override
     public String toString() {
         return "X";