fixes #7380 birthday search
fixes #7375 basic criteria panel
Merge branch 'dev' into test