Fixing calculator button bug
Speeding up filtering