Refactor of shared filtering methods in CodeSystemVersionQuery and
MapVersionQuery