Refactor filters and Blockchain, Fixed #55