fixed query to do proper aliasing
bad old query and beginning of new fixed one
long query updated, but still too slow
sampled files for Jodi