Prevent duplicate listing by using containable

Closes #9

@ecoreng, can you help verifying?