Improved EDM Queries

More accurate patient and generic doc quiries