I am 485 pending and have used AP in 2008, and I-94 based on AP is already expired in 2009. My H1 will expire on 09/30/2010.

On I-129 page 2 part3 My current nonimmigration status will fill it with H-1B and status expire will fill out 09/30/2010. is this right?

Thanks in advance.