when create CQs, check related fields
remove unused file
ignore blank field when create CQs
refine layout
refine layout