Fixed sub-queries more!