enhanced typed queries