correct indicator calculation when null & percent