Language parameter added to link builder

2nd try