Query time boost

not if i use generics, which i won't give up