Fixed remote search and hitlist, closing #124