Trello #203

Fix for filtering patients.
Merge remote-tracking branch 'origin/develop' into develop