Updated some todos:

Added metadata tag insert, query filtering.