Cleaned up handling of connectives for wh queries