Switches to tenant picking by mask instead of hard-coded one