Added the NEIC and CWB query