Fix waiting selector for max AP in constructions