Slightly improve searching functionality