Corrected bugs, remove filter