improve query properties de-/serialization