check
done
jsonfix
fixed test
Merge pull request #1505 from john-hill/entity-query

Entity query