Improve assets tags generation