cleanup code, removed warning and filter *ONLY* on input name