refactoring
speed up schema, refactoring, add filtering field list