Fixing query in order to last change.