Change order of filters and fix some minor things