add plugin queries
add layout support
add layout wrapper