Added the boolean filter and added more types.