Improve warnings
Use simpler filtering (probably won't affect speed)