Update the `Events` examples
Delete the key if its value is an empty hash
Complete the optional query