Fix bug with multiple entries in 'generic' table

Change-Id: I16b108cf39572ae07dfbafd48c29630f6abaedb5
Reviewed-by: Juha Sippola <juhasippola@ovi.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>