Added search via account type
Refined search so that it returns accurate results