Fix for option values that are duplicated on the page