Cleanups + moved filtering code to dico.
Added master-details capability.
Merge branch 'master' into gh-pages