fixed more bugs see bugs labelled 1/2DONE(2), DONE(2) at https://notes.openmrs.org/ChartSearch-Module-Bugs