move default query, def to central place
update layout
update pivot config