Adding MetaData model visitor for filter fields operation and Modifying the query model to easy building and maintaining