Cleaned up database structure and related query
Updated text for link to item