add more field handling and hide unhandled fields