Thank you, I'll fix these in the next version :)
And I will try to find a way around it :D
Sounds as a mini challenge :D
Indeed