ticket:57 made filtering more angular-ish