Improved search time by a few seconds