refact no query get