Add query serialization.
Add query deserialization.
Query fixes for Skybox.