Various Height Query Fixes

[alexanderbez]

closes #4903

---

• Targeted PR against correct branch (see CONTRIBUTING.md)

• Linked to github-issue with discussion and accepted design OR link to spec that describes this work.

• Wrote tests

• Updated relevant documentation (docs/)

• Added a relevant changelog entry to the Unreleased section in CHANGELOG.md

• Re-reviewed Files changed in the github PR explorer

---

For Admin Use:

• Added appropriate labels to PR (ex. wip, ready-for-review, docs)
• Reviewers Assigned
• Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

[codecov]

Codecov Report

Merging #4905 into master will increase coverage by <.01%.
The diff coverage is 33.33%.

@@            Coverage Diff             @@
##           master    #4905      +/-   ##
==========================================
+ Coverage   53.63%   53.64%   +<.01%     
==========================================
  Files         270      270              
  Lines       16982    16988       +6     
==========================================
+ Hits         9109     9113       +4     
- Misses       7184     7185       +1     
- Partials      689      690       +1