- Added support for more than 1 search point