Query: workaround master not profiling

See #671