#37 query keys simplified, containing more info