fix missing cases if layouts will set - only the system wide were used. Now the user ones are prefered
updated