encounter table search now working correctly
Merge branch 'beta2.0' of https://github.com/alee111777/usagestatistics668 into beta2.0