changed initial query behavior