Fix - Problem of wrong quetes