component filtering works a lot better now