Added scalar cluster analysis based query elaboration - Not tested, functions in place