fix recovery logic
fix attach & apply new servers logic