Added qdisk check, improved queried node selection