Updating mentions to have code for last name selections only