Objective of the refactoring is to: Simplified metafields searches and started to add support of multi-field and edition