Added filtering, data fixes & meta data support