Better filter which images are included from building-blocks