more replacing subspecs (now with restrict_by_join)
more replacing subspecs (now with restrict_by_join)
got rid of "subspec"
Merge branch 'optiwql'