NXP-10878: add needed classes for styles
NXP-10840: fix query operator