Merge pull request #287 from nla/hr-if-fixes

Search screen reformat
Merge remote-tracking branch 'origin/master' into hr-if-fixes