Merge branch 'data_query_master' into data_query
res gets json with all facility information
res also includes info sheets json
merge data_query into nlp