Fixed query to some point for the new API