filter builder fixed