Added check and removed filter commands