Improve FX component selection ability