PR fix to break the for loop if correct match record found