Made filtering more nicely