Some fixes and Code and Filter now only take numbers