Update on UI and querying unique values to avoid errors when pulling