added query-lookup