Add examples, change to JS only queries
Change to JS only queries