Fixing filter error. Console logs are now clean-ish
Cleaning up more console log statements