Resolved the logic in FrmList and FrmMainEntry.