Craig - boomqueries with modals