updated drop down and handled no rows case :P