am 95f6c758: Search tag additions

* commit '95f6c758ae176747cf6675e37b984a8aece29dcd':
  Search tag additions