fixing joined-find queries