Fixed finding saving issues with various fields