Fixed error where custom values wouldn't be saved, no not found for non pedantic

Merged Benjamin Baer requested to merge support_4309_4310 into master

Merge request reports