Combine regexp, fix response handling bug