Fixes in DB Query, Number Appending to Name