Fix some filters including types and custom pins