remove old eap hack and support multiple annotation tags #12