fix to query current