Added support for data extraction from block marker.
Added query use filter.