Changes in Conditions::factory to handle null and not_null comparison operators