Added handling for complex types when querying about Entity properties.