diff --git a/metadata/com.adam.aslfms.txt b/metadata/com.adam.aslfms.txt
index 4196357d63..9035dc9ce5 100644
--- a/metadata/com.adam.aslfms.txt
+++ b/metadata/com.adam.aslfms.txt
@@ -6,12 +6,17 @@ Issue Tracker:https://github.com/tgwizard/sls/issues
 
 Summary:Last.fm/Libre.fm Scrobbler
 Description:
-Scrobbling means submitting listening information to Last.fm and/or Libre.fm; you can then get music 
-recommendations and view your listening history and statistics. The media player that you use must be able 
-to work with the API e.g. [[org.kreed.vanilla]] or [[jp.co.kayo.android.localplayer]]. 
-Apps can also hook into the Now-Playing broadcast: for example, [[com.jlyr]] can use it to grab lyrics.
+Scrobbling means submitting listening information to Last.fm and/or Libre.fm; 
+you can then get music 
+recommendations and view your listening history and statistics. 
+The media player that you use must be able 
+to work with the API e.g. [[org.kreed.vanilla]] or 
+[[jp.co.kayo.android.localplayer]]. 
+Apps can also hook into the Now-Playing broadcast: for example, [[com.jlyr]] 
+can use it to grab lyrics.
 
-More info about scrobbling can be found on [http://www.last.fm/help/faq?category=Scrobbling#201 Last.fm's FAQ].
+More info about scrobbling can be found on 
+[http://www.last.fm/help/faq?category=Scrobbling#201 Last.fm's FAQ].
 .
 
 Repo Type:git
@@ -21,8 +26,7 @@ Build Version:1.4.3,30,v1.4.3,rm=other/RhapsodyAndroidPreview.apk
 Build Version:1.4.4,31,v1.4.4,rm=other/RhapsodyAndroidPreview.apk
 
 Auto Update Mode:None
-#Tags don't work: wrong branch
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:1.4.5
 Current Version Code:32
 
diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt
index 4112a5903a..d5456c5113 100644
--- a/metadata/com.github.mobile.txt
+++ b/metadata/com.github.mobile.txt
@@ -30,7 +30,7 @@ Build Version:1.5,1100,1.5,maven=yes,bindir=app/target
 Build Version:1.6.1,1300,1.6.1,maven=yes,bindir=app/target
 
 Auto Update Mode:Version %v
-#Tags can't find Manifest
+#Manifest isn't in root dir
 Update Check Mode:Market
 Current Version:1.6.1
 Current Version Code:1300
diff --git a/metadata/com.nolanlawson.chordreader.txt b/metadata/com.nolanlawson.chordreader.txt
index 77e81ab127..cd0c7a6ce6 100644
--- a/metadata/com.nolanlawson.chordreader.txt
+++ b/metadata/com.nolanlawson.chordreader.txt
@@ -21,8 +21,7 @@ Repo:https://github.com/nolanlawson/ChordReaderRoot.git
 
 Build Version:1.0.1,8,v1.0.1,subdir=ChordReader
 
-#Tags can't find AM.xml
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:1.0.1
 Current Version Code:8
 
diff --git a/metadata/net.everythingandroid.smspopup.txt b/metadata/net.everythingandroid.smspopup.txt
index cbcf088812..f144ed8b2b 100644
--- a/metadata/net.everythingandroid.smspopup.txt
+++ b/metadata/net.everythingandroid.smspopup.txt
@@ -23,7 +23,7 @@ srclibs=ViewPagerIndicator@65457eac06,\
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ViewPagerIndicator$$@' project.properties 
 
 #Device variable and Tags doesn't work
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:1.2.4
 Current Version Code:124
 
diff --git a/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt b/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
index 5e5c2943ed..3375b736cd 100644
--- a/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
+++ b/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
@@ -22,8 +22,7 @@ Build Version:0.6.10,47,v0.6.10,subdir=variant/dnt,update=.;../..,prebuild=mkdir
 Build Version:0.6.11,48,v0.6.11,subdir=variant/dnt,update=.;../..,prebuild=mkdir -p src
 
 Auto Update Mode:None
-#Tags nukes repo?!
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:0.6.11
 Current Version Code:48
 
diff --git a/metadata/org.wheelmap.android.online.txt b/metadata/org.wheelmap.android.online.txt
index b9a265a18b..afadbc8312 100644
--- a/metadata/org.wheelmap.android.online.txt
+++ b/metadata/org.wheelmap.android.online.txt
@@ -33,8 +33,7 @@ echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
 #srclibs=HoloEverywhere@holoeverywhere-1.2.2;PullToRefresh@v1.4.0;ActionBarSherlock@4.1.0
 
 Auto Update Mode:None
-#Tags and RM don't see AM.xml
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:0.8.3
 Current Version Code:16