Fix for #726 #738 issues, evaluation of queries into singleton
Added missing file header