added new query interface
merged