Well3 term updates and added OC_query parser for ccl