Parameterized database queries
Changes to click handler