Bug fixes and adding multi search feature