refined account types query.
Updated DB names