Allow query by name
Use regex to match queries
Specify json
Update README