Improvements to search & update functionality + highlight saved options when editing