current: fix filtering, less memory usage, simplification & code cleanup