Many thanks for the patch. I've added "survey" to the oacs-5-8 branch, applied the patch. Since it is tested, is now a candidates for release for 5.8.1
all the best -g