Changed SQL from LIKE to =
changed non_id field to alternate generate_list function