Various fixes and additions for Finntack

@clementhk Hey, this are the changes based on 2.6 that I made. I just want to make sure that any changes are tracked properly :)
I do not think this is actually a proper solution. I think it should be an id that is used in JS and not a class.
I will spent more time tomorrow to make a proper patch that can also be sent upstream.