Updated with dictified query