[RFC] CARA-2020

query fixed to use eager joining