PropertyDescriptor improved, query retrieval.