Query time boost

final ?