improved query efficiency
temporarily disabled custom attributes to improve performance