Added query scaffold
implemented new design