Added query to demo, changed style