Improved entity codes on our Rcpt table