Add a little more filtering stuff