Small fixes for tag search