Patch Set 6:

@Robin:
Issue#1: Very strange. I never had such situation and I doubt that I could reproduce that. Could you be more specific how it can be reproduce ?

Issue#2: I never consider editing or reviewing un-annotated tags, so this is main cause why it does not working. Fixing this will be very easy ;)