add support for faster search