Fix filter correctly, save hathor changes for later.