Fix bugs and N/A label included