Fixed issue when getting info from DB
Updated adapter stuff