includes instead of joins
++
refactor
remove test
filter results with no call
++