[*] FO : lots of performance improvements (removed or merged useless SQL queries)