updated with query for builder page