Fix availability survey resolving