Have theorem 4.6 now. Changed query type to single_query and general_query
and some other depedent changes