Added some more command filters and applied them to commands