Issue #32: doing some filter DRY fixes + adding usages/route/valleys/theme filter logic