Refactoring a bit around tag setup on android.