feature/filter improvements

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