Fixed non-id/name input handling