Filter revisions in database query, remove if statements and refactor

Adam Bramleyrequested to merge
issue/diff-3418442:3418442-filter-by-language into 2.x

Closes #3418442

Merge request reports