added amount filter (from - to)
some refactoring made