Filter order. Fix #196 and fix #205. Thanks @brianteeman