Greater WPML compatibility.

Still things to be done, but seems working fine.