Full fix for CRM-13293. Also includes query optimization in where() function.
Converted to the address functions in base class
Added missing $entryFound logic in alterDisplay()
Merge pull request #1516 from cividesk/CRM-13293

Looks good. Merged.