Fix error e.g. "core segment already exists" in query handling