Improved merchant account ID detection