Some others queries fixed !