Merge pull request #1009 from Soul1355/Test

Improved instant search and set default on