Don't use log scale as it throws off chart

Also flip the order of some filtering to speed up performance a bit
Change variable names for clarity