modify querying interface