Rename event handler for consistency
Include selected metadata in search