[*] CORE : Remove duplicate SQL queries