Limit tags

I think this is correct now. 

Care to test?

Cheers,
David