Subjects code change reviewed and added swapping
Filter out dummy patient on queries involving subjects
Merge branch 'fix/change-subj-codes' into develop