added server side factual queries. 3 ready, 1 tested only
blah
fixed the conflict?
merge