#1620 User search should match the used settings
Merge pull request #1628 from xillibit/k30_bugs16

#1620 User search should match the used settings