further tweak (and optimize) the scoring query