NXP-12435: format / more query models cleanup