Query optimisation

Hi Ifor
I created a new thread if you would like to have a look