Fix Tax editor and refactor command verify plugin