Fix filter 8 & 13