Done some cleanup in OPFUpdateQuery
Fixed merge issues. Did some more cleanup of OPFUpdateQuery