Removed unnecessary else
Moved query to grab everything from DB