Added query parsing to NSDictionary