Fix for querries : Issue 5