Use the new selection framework in tagging.c as well