Fixed Object Query
Fixed some formatting