Open Search resolve #154