fixing up init of properties to avoid double-querying