Filter revisions in database query, remove if statements and refactor

Closes #3418442

Merge request reports

Loading