Fix bugs; improve tag search