[#ADMCON-34: removed null value when saved]
[#ADMCON-34: added proper ignores]
[#ADMCON-26: removed wrong adds]