added query serializer