Fixing search by metadata