Re-organised filters

For some reason they didn’t like being the other way around.