UPDATED: #6 - Optimized search in windows GUI client