RC-198 new frequency fields saved on entity
rc-192 corrected field mapping