added switch retrieval improvements