Added bug fix on amount filter