Added some enhancement
First attempt to filter the extracted metadata