Add query key parsing