add query for simple markup
modularization