Improved Query generation to allow joins (via Query Options)