improved sub query handling (#13)