adding filter cursor and more parsing rules