Fix Filter Bug