added better repair request handling