Small code cleanup in the query startegy just added