FFD selection improved: bug fixing and performance improvements