Adding back serializer based query-key