improve 2.0 & 2.1 power rate validator behaviour