Clarify config labels (Fix #29)
Refactor search filter (Fix #30)
Merge branch 'master' into namespace