completing fixes to retrieve patients by identifier

Code is ugly. Needs clean up :-(