fix option duplicate entity issue
fix option issue