Simplify alerts and use promises
Simplify filters