Increase tags string size
Make extension a bit more flexible