Some common filed types changes to fix filtering and editing elements