You are great, thanks very much.
I was worried that if I try to change codes in several files then on updates site will break and cause a lot of extra work.
I entered the suggested code after L176 and all works as desired. (I hope this is the correct place.)