Updated query to take external questions