v0.6.9 Code refactorization, fixed FK filter