Add guards for unsupported subqueries join plan, optimize the possible subqueriese

catched -> caught