[feature branch] filter improvements

Just for Travis (as I don't rebase the branche onto master, where Travis would actually test feature branches).