Fix REST parsing to work with later ODL; add more match fields to flows query